builder: Fix compiler warnings

Fix warnings due to -Wdeclaration-after-statement and -Wshadow.

diff --git a/gtk/gtkbuilder-menus.c b/gtk/gtkbuilder-menus.c
index 8a42faa9f947a472795e13fd545086e0b1998a93..2259cd076d52f167185f1e9c56e1489fe385b2a7 100644 (file)
--- a/gtk/gtkbuilder-menus.c
+++ b/gtk/gtkbuilder-menus.c
@@ -163,11 +163,11 @@ gtk_builder_menu_start_element (GMarkupParseContext  *context,
         {
           const gchar *typestr;
           const gchar *name;
-          const gchar *context;
+          const gchar *ctxt;
 
           if (COLLECT (STRING,             "name", &name,
                        OPTIONAL | BOOLEAN, "translatable", &state->translatable,
-                       OPTIONAL | STRING,  "context", &context,
+                       OPTIONAL | STRING,  "context", &ctxt,
                        OPTIONAL | STRING,  "comments", NULL, /* ignore, just for translators */
                        OPTIONAL | STRING,  "type", &typestr))
             {
@@ -182,7 +182,7 @@ gtk_builder_menu_start_element (GMarkupParseContext  *context,
               state->type = typestr ? g_variant_type_new (typestr) : NULL;
               state->string = g_string_new (NULL);
               state->attribute = g_strdup (name);
-              state->context = g_strdup (context);
+              state->context = g_strdup (ctxt);
 
               gtk_builder_menu_push_frame (state, NULL, NULL);
             }